Auto merge of #2384 - jseyfried:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 12 Feb 2016 22:09:11 +0000 (22:09 +0000)
committerbors <bors@rust-lang.org>
Fri, 12 Feb 2016 22:09:11 +0000 (22:09 +0000)
commit2e267ece7b9e3d52661a81f8cf21c8c127fd1f17
tree48413e02a5ce809d1cfa3b6558402cb413568054
parenta3d8dcf536d84de89bc34b53c4997247dc9aec75
parentd521a9a007c596a8fdbdfbac5a812f789c145ac5
Auto merge of #2384 - jseyfried:master, r=alexcrichton

r? @alexcrichton